From: Sean Whitton Date: Tue, 15 Jul 2025 14:35:01 +0000 (+0100) Subject: Backport upstream commit adding builtin packages query interfaces X-Git-Tag: archive/raspbian/1%30.2+1-2+rpi1^2~22 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=c02f915444cccef47ea930651c1c4572296b2ece;p=emacs.git Backport upstream commit adding builtin packages query interfaces See #1103033. --- c02f915444cccef47ea930651c1c4572296b2ece diff --cc debian/.git-dpm index c069fabd312,00000000000..0b640384571 mode 100644,000000..100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@@ -1,8 -1,0 +1,8 @@@ +# see git-dpm(1) from git-dpm package - 22d6e7ad34d947c1154358cd3a59789f539a9cf5 - 22d6e7ad34d947c1154358cd3a59789f539a9cf5 ++52a49907e53a0f4f484e0759ae317fd728f12153 ++52a49907e53a0f4f484e0759ae317fd728f12153 +c512c0fa6ab117d10b0602d2b2d1fe5880695944 +c512c0fa6ab117d10b0602d2b2d1fe5880695944 +emacs_30.1+1.orig.tar.xz +09c8a2c6420edf1c0eafbe02c108fdaaf9d3a105 +31081984 diff --cc debian/patches/0022-Add-public-interfaces-for-accessing-builtin-package-.patch index 00000000000,00000000000..b271d6ed4ae new file mode 100644 --- /dev/null +++ b/debian/patches/0022-Add-public-interfaces-for-accessing-builtin-package-.patch @@@ -1,0 -1,0 +1,48 @@@ ++From 52a49907e53a0f4f484e0759ae317fd728f12153 Mon Sep 17 00:00:00 2001 ++From: Xiyue Deng ++Date: Fri, 20 Jun 2025 21:34:45 -0700 ++Subject: Add public interfaces for accessing builtin package info (Bug#78844) ++ ++The following upstream patch has been backported: ++ ++ Add public interfaces for accessing builtin package info (Bug#78844) ++ ++ * lisp/emacs-lisp/package.el (package-builtin-packages) ++ (package-builtin-package-version): New functions. ++ * doc/lispref/package.texi: Add a section 'Package Information' with ++ documentation for the new functions. ++ * etc/NEWS: Add entry for 'package-versioned-builtin-packages' and ++ 'package-builtin-package-version'. ++ ++Origin: upstream, commit 5c75ec6ae52a5b06ad0424ce805f5ea0432b6e90 ++Forwarded: not-needed ++--- ++ lisp/emacs-lisp/package.el | 15 +++++++++++++++ ++ 1 file changed, 15 insertions(+) ++ ++diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el ++index be3b85f3179..82b7520a707 100644 ++--- a/lisp/emacs-lisp/package.el +++++ b/lisp/emacs-lisp/package.el ++@@ -669,6 +669,21 @@ package-alist ++ loaded and/or activated, customize `package-load-list'.") ++ (put 'package-alist 'risky-local-variable t) ++ +++;;;; Public interfaces for accessing built-in package info +++ +++(defun package-versioned-builtin-packages () +++ "Return a list of all the versioned built-in packages. +++The return value is a list of names of built-in packages represented as +++symbols." +++ (mapcar #'car package--builtin-versions)) +++ +++(defun package-builtin-package-version (package) +++ "Return the version of a built-in PACKAGE given by its symbol. +++The return value is a list of integers representing the version of +++PACKAGE, in the format returned by `version-to-list', or nil if the +++package is built-in but has no version or is not a built-in package." +++ (alist-get package package--builtin-versions)) +++ ++ ;;;###autoload ++ (defvar package-activated-list nil ++ ;; FIXME: This should implicitly include all builtin packages. diff --cc debian/patches/series index c4483b12b4b,00000000000..147ee87103e mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,21 -1,0 +1,22 @@@ +0001-Prefer-usr-share-info-emacs.patch +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch +0004-Adjust-documentation-references-for-Debian.patch +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch +0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch +0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch +0008-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch +0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch +0010-Mark-test-undo-region-as-unstable.patch +0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch +0012-Add-inhibit-native-compilation.patch +0013-Rename-to-inhibit-automatic-native-compilation.patch +0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch +0015-Change-native-comp-async-jobs-number-default-to-1.patch +0016-Change-native-comp-async-report-warnings-errors-to-s.patch +0017-Mark-dired-test-bug27243-02-as-unstable-for-now.patch +0018-Fix-eldoc-warning-in-patch-adding-debian-emacs-flavo.patch +0019-Boost-BASE_PURESIZE-in-attempt-to-fix-build-on-32-bi.patch +0020-Disable-server-tests-server-force-stop-keeps-frames-.patch +0021-Disable-emacs-module-tests.el.patch ++0022-Add-public-interfaces-for-accessing-builtin-package-.patch